bitkeeper revision 1.1062.1.2 (40f03be45vi3trPSnOPEM4qVXFTLFw)

Fix to /etc/xen/network script.

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index 2331290f1e9c007561c12424a4cb5e56a4b1db1a..8f11ded149d86f128ae30138513e6fbac2f23bc8 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -32,3 +32,6 @@ xen/figlet/figlet
 xen/xen
 xen/xen-syms
 xen/xen.*
+tools/xfrd/xfrd
+xen/tools/elf-reloc
+xen/tools/figlet/figlet

diff --git a/tools/examples/network b/tools/examples/network
index 49ce29da0a89a7cec08148c34e8597a4920c0a54..1c0505f6f399cd2705081910e45d9265dba2705d 100755 (executable)
--- a/tools/examples/network
+++ b/tools/examples/network
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh 
 #============================================================================
 # Example Xen network start/stop script.
 # Xend calls a network script when it starts.
@@ -54,9 +54,10 @@ transfer_addrs () {
     fi
     # Address lines start with 'inet' and have the device in them.
     # Replace 'inet' with 'ip addr add' and change the device name $src
-    # to 'dev $src'.
+    # to 'dev $src'. Remove netmask as we'll add routes later.
     ip addr show dev ${src} | egrep '^ *inet' | sed -e "
 s/inet/ip addr add/
+s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\)/[0-9]\+@\1@
 s/${src}/dev ${dst}/
 " | sh -e
 }